Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

disttask: add fields for resource control & remove global/g prefix from task #49020

Merged
merged 16 commits into from
Dec 1, 2023
Merged

disttask: add fields for resource control & remove global/g prefix from task #49020

merged 16 commits into from
Dec 1, 2023

Conversation

D3Hunter
Copy link
Contributor

@D3Hunter D3Hunter commented Nov 29, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #49019

Problem Summary:

What changed and how does it work?

  • add priority/create_time/end_time to mysql.tidb_global_task/mysql.tidb_global_task_history(Note, end_time is not set now, will fix it later. below too)
  • add concurrency/priority/create_time/end_time to mysql.tidb_background_subtask/mysql.tidb_background_subtask_history
  • add idx_exec_id(exec_id) on mysql.tidb_background_subtask
  • change task/subtask query part accordingly
  • fix incorrect set subtask.summary
  • some refactor in task table manager

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    start tidb, verify schema; upgrade tidb from 7.4.0, see schema is changed
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 29, 2023
@tiprow tiprow
Copy link

tiprow bot commented Nov 29, 2023

Hi @D3Hunter. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@D3Hunter
Copy link
Contributor Author

/run check-issue-triage-complete

@D3Hunter
Copy link
Contributor Author

/check-issue-triage-complete

@codecov Codecov
Copy link

codecov bot commented Nov 29, 2023 •
edited
Loading

Codecov Report

Merging #49020 (0a18ca5) into master (d60c8e4) will increase coverage by 1.3364%.
Report is 21 commits behind head on master.
The diff coverage is 2.8000%.

Additional details and impacted files 
@@               Coverage Diff                @@
##             master     #49020        +/-   ##
================================================
+ Coverage   70.9930%   72.3295%   +1.3364%     
================================================
  Files          1368       1397        +29     
  Lines        403986     414297     +10311     
================================================
+ Hits         286802     299659     +12857     
+ Misses        97214      95779      -1435     
+ Partials      19970      18859      -1111
Flag Coverage Δ
integration 43.6671% <2.8000%> (?)
unit 71.0005% <ø> (+0.0074%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9663% <ø> (ø)
parser ∅ <ø> (∅)
br 48.3087% <ø> (-4.6736%) ⬇️

ywqzzy
ywqzzy reviewed Nov 30, 2023
View reviewed changes
pkg/ddl/index.go Outdated
@@ -2189,7 +2189,7 @@ func (w *worker) updateJobRowCount(taskKey string, jobID int64) {
logutil.BgLogger().Warn("cannot get task manager", zap.String("category", "ddl"), zap.String("task_key", taskKey), zap.Error(err))
return
}
gTask, err := taskMgr.GetGlobalTaskByKey(w.ctx, taskKey)
gTask, err := taskMgr.GetTaskByKey(w.ctx, taskKey)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about change all gtask to task?

okJiang
okJiang reviewed Nov 30, 2023
View reviewed changes
Copy link
Member

@okJiang okJiang left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest lgtm. can discuss with other reviews

pkg/disttask/framework/storage/task_table.go Outdated Show resolved Hide resolved
pkg/disttask/framework/storage/task_table.go Show resolved Hide resolved
pkg/disttask/framework/storage/task_table.go Outdated Show resolved Hide resolved
@D3Hunter D3Hunter changed the title disttask: add fields for resource control disttask: add fields for resource control & remove global/g prefix from task Nov 30, 2023
@D3Hunter
Copy link
Contributor Author

/retest

@tiprow tiprow
Copy link

tiprow bot commented Nov 30, 2023

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 30, 2023
@D3Hunter
Copy link
Contributor Author

/retest

@tiprow tiprow
Copy link

tiprow bot commented Nov 30, 2023

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 30, 2023
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Nov 30, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-11-30 07:39:52.514928762 +0000 UTC m=+1081221.180154957: ☑️ agreed by okJiang.
  • 2023-11-30 09:34:47.648517147 +0000 UTC m=+1088116.313743342: ☑️ agreed by ywqzzy.

bb7133
bb7133 reviewed Nov 30, 2023
View reviewed changes
pkg/session/bootstrap.go Outdated Show resolved Hide resolved
yudongusa
yudongusa approved these changes Dec 1, 2023
View reviewed changes
Copy link

@yudongusa yudongusa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for the bootstrap.

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 1, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: okJiang, yudongusa, ywqzzy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Dec 1, 2023
@ti-chi-bot ti-chi-bot bot merged commit 3b419c5 into pingcap:master Dec 1, 2023
15 checks passed
@D3Hunter D3Hunter deleted the rc-dispatcher branch December 1, 2023 05:11
This was referenced Dec 7, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 left review comments

@yudongusa yudongusa yudongusa approved these changes

@ywqzzy ywqzzy ywqzzy approved these changes

@okJiang okJiang okJiang approved these changes

Assignees
No one assigned
Labels
approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

add fields for resource control
5 participants
@D3Hunter @bb7133 @okJiang @ywqzzy @yudongusa